From: Kenichi Handa <handa@m17n.org>
Date: Fri, 8 Jan 2010 01:53:29 +0000 (+0900)
Subject: from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8771^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=28522f0b8561291b374288701039c8137e954b06;p=emacs.git

from trunk
---

28522f0b8561291b374288701039c8137e954b06
diff --cc lisp/ChangeLog
index 01f1da34f05,9788c08eb92..1166b47c950
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +2010-01-08  Kenichi Handa  <handa@m17n.org>
 +
 +	* international/fontset.el (build-default-fontset-data): Exclude
 +	characters in scripts kana, hangul, han, or cjk-misc.
 +
+ 2010-01-07  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename
+ 	to `create-file-buffer' as it expects, not just a buffer name.
+ 	(vc-dir-mode): Include the buffer name in `list-buffers-directory',
+ 	to help uniquify.  (Bug#3224)
+ 
  2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
  
  	* font-setting.el (font-setting-change-default-font): Use user-spec